auto merge of #922 : steveklabnik/cargo/patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 20 Nov 2014 19:29:22 +0000 (19:29 +0000)
committerbors <bors@rust-lang.org>
Thu, 20 Nov 2014 19:29:22 +0000 (19:29 +0000)

Trivial merge